From 3c2b51197fbbed13dd596d8643777f4b496af6f7 Mon Sep 17 00:00:00 2001 From: robertl Date: Sat, 8 Apr 2006 19:21:04 +0000 Subject: [PATCH] (Makefile.in, readme.xml): From Ron - Use xsltproc and avoid hardcoded pathnames for doc. config.h.in, configure.in, configure: Add test for sleep. --- gpsbabel/Makefile.in | 10 +++++++--- gpsbabel/config.h.in | 3 +++ gpsbabel/configure | 3 ++- gpsbabel/configure.in | 2 +- gpsbabel/readme.xml | 4 ++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index edb6c1a01..471d5c2e1 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -129,9 +129,13 @@ dep: # Requires CLASSPATH be exported to include full path to saxon.jar. # (typically /usr/share/java on a Linux system.) readme.html: readme.xml - java com.icl.saxon.StyleSheet $< \ - /usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl \ - html.stylesheet="http://www.gpsbabel.org/style3.css" > $@ || rm $@ + xsltproc --stringparam html.stylesheet \ + "http://www.gpsbabel.org/style3.css" \ + http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \ + $< > $@ || rm $@ +# java com.icl.saxon.StyleSheet $< \ +# /usr/share/sgml/docbook/xsl-stylesheets/xhtml/docbook.xsl \ +# html.stylesheet="http://www.gpsbabel.org/style3.css" > $@ || rm $@ cp readme.html $(WEB)/readme.xhtml tools/mkcapabilities diff --git a/gpsbabel/config.h.in b/gpsbabel/config.h.in index 405ec108a..f0ff994a3 100644 --- a/gpsbabel/config.h.in +++ b/gpsbabel/config.h.in @@ -12,6 +12,9 @@ /* Define to 1 if you have the `nanosleep' function. */ #undef HAVE_NANOSLEEP +/* Define to 1 if you have the `sleep' function. */ +#undef HAVE_SLEEP + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/gpsbabel/configure b/gpsbabel/configure index 6b27bd447..caa3e1fce 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -2675,7 +2675,8 @@ fi # AC_FUNC_VPRINTF # AC_CHECK_FUNCS([atexit floor localtime_r memmove memset pow select sqrt strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol strtoul]) -for ac_func in nanosleep + +for ac_func in nanosleep sleep do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index 6003a9c7f..d4696748f 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -100,7 +100,7 @@ AC_SUBST(EXPAT_LIB) # AC_FUNC_STRTOD # AC_FUNC_VPRINTF # AC_CHECK_FUNCS([atexit floor localtime_r memmove memset pow select sqrt strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol strtoul]) -AC_CHECK_FUNCS(nanosleep) +AC_CHECK_FUNCS([nanosleep sleep]) #AC_CONFIG_FILES([Makefile # coldsync/Makefile diff --git a/gpsbabel/readme.xml b/gpsbabel/readme.xml index 1b6e9a03a..5cebd9dc6 100644 --- a/gpsbabel/readme.xml +++ b/gpsbabel/readme.xml @@ -1,7 +1,7 @@ - + -- 2.30.2